Don't define BITMAPV5HEADER on mingw with w32api >= 3.8, which has it in

2007-02-04  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkcursor-win32.c: Don't define BITMAPV5HEADER on
	mingw with w32api >= 3.8, which has it in wingdi.h. (#403896)

svn path=/trunk/; revision=17256

diff --git a/ChangeLog b/ChangeLog
index c201f76ff6944e53eb701e8b2d3aefcde829971e..98c3b2b1a571dc4cbef5aa6d5990b8709d65e167 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-04  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkcursor-win32.c: Don't define BITMAPV5HEADER on
+       mingw with w32api >= 3.8, which has it in wingdi.h. (#403896)
+
 2007-02-02  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_row_changed): remove unused

diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index a0e702e5c6594c1af6db6b333f996cc87a616888..28151f93c32698bdae958601673d8141b20cf31f 100644 (file)
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -25,9 +25,13 @@
 #include "gdkcursor.h"
 #include "gdkprivate-win32.h"
 
+#ifdef __MINGW32__
+#include <w32api.h>
+#endif
+
 #include "xcursors.h"
 
-#if defined(__MINGW32__) || (defined(_MSC_VER) && (WINVER < 0x0500))
+#if (defined(__MINGW32__) && __W32API_MAJOR_VERSION <= 3 && __W32API_MINOR_VERSION < 8) || (defined(_MSC_VER) && (WINVER < 0x0500))
 typedef struct { 
   DWORD        bV5Size; 
   LONG         bV5Width;